From b51a2d89d36fa8e7b571022dadcfd5331cfa7af1 Mon Sep 17 00:00:00 2001 From: Roger Pau Monne Date: Fri, 22 Sep 2017 16:25:10 +0100 Subject: [PATCH] libxl: PVH guests use PV nics MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove device model "none" support from the nic functions. Signed-off-by: Roger Pau Monné Acked-by: Ian Jackson --- tools/libxl/libxl_nic.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/libxl/libxl_nic.c b/tools/libxl/libxl_nic.c index 9daecf7528..1e6ba6c78d 100644 --- a/tools/libxl/libxl_nic.c +++ b/tools/libxl/libxl_nic.c @@ -92,18 +92,17 @@ static int libxl__device_nic_setdefault(libxl__gc *gc, uint32_t domid, switch (libxl__domain_type(gc, domid)) { case LIBXL_DOMAIN_TYPE_HVM: if (!nic->nictype) { - if (hotplug || - (libxl__device_model_version_running(gc, domid) == - LIBXL_DEVICE_MODEL_VERSION_NONE)) + if (hotplug) nic->nictype = LIBXL_NIC_TYPE_VIF; else nic->nictype = LIBXL_NIC_TYPE_VIF_IOEMU; } break; + case LIBXL_DOMAIN_TYPE_PVH: case LIBXL_DOMAIN_TYPE_PV: if (nic->nictype == LIBXL_NIC_TYPE_VIF_IOEMU) { LOGD(ERROR, domid, - "trying to create PV guest with an emulated interface"); + "trying to create PV or PVH guest with an emulated interface"); return ERROR_INVAL; } nic->nictype = LIBXL_NIC_TYPE_VIF; -- 2.30.2